Merge "Performance optimizations for new insets" into rvc-dev am: 367257cf am: 728adc03 am: 1a13e050 Change-Id: I34c5d7a1840e57395da0aa7c70de923688effd69