Merge "ignore orientation change which can happen due to replica island" into jb-mr2-dev