Merge "Move dimens from overlay to framework"