Merge "Fix unnecessarily extended View lifetime in IMMS" into pi-dev