Merge "Handle ScreenNail size change." into jb-dev