Merge "Fix unnecessarily extended View lifetime in IMMS" into pi-dev
am: 3e180afa02

Change-Id: Ic3d7b3fb51cc2b5cee8e2ae508679e2035d0931b