Merge "DO NOT MERGE:The visiblerect calculation should take view's scaling into consideration" into jb-dev