Merge "Revert "Change override displayFrame to mBounds"" into tm-dev