Merge "Revert^2 "Refresh layout parameter for bounds change from relayout"" into udc-dev