Merge "Performance optimizations for new insets" into rvc-dev am: 367257cfc4

Change-Id: I752f13c83e3b0a7e692c5367f97cb34d43c88fac