Merge "Add configChange screenSize" into jb-mr1-dev