Merge "Detect layout change of paramsForRotation precisely" into tm-qpr-dev