Merge "Fix some dimens in dialog" into sc-qpr1-dev