Merge "Adding a level of indirection. Dimens value should live in the framework/base and not the overlay." into qt-dev