Merge "Try to fix stale mDisplaySize" into tm-qpr-dev