Merge "Merge "Pip entry bounds incorrect upon rotation" into tm-qpr-dev am: 5f5fe88458 am: b451f4ddd1"