am c421de27: am 91c1435e: Merge "Handle ScreenNail size change." into jb-dev

* commit 'c421de27ddd1330732e5f3ceddd4136cb1e27520':
  Handle ScreenNail size change.