am 2f6fb1ce: am 25a91535: Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev

* commit '2f6fb1ceef0fa27ecea869934b4c09ade97ec2cc':
  Update the screen nail size even if screen nail is still the same one.