Merge "Modify dimens.xml and change full screen preview behavior"