Merge "Fine-tune the screen size by adb command to adjust the screen size for UX"