Merge "Update the screen nail size even if screen nail is still the same one." into jb-dev