Merge "Fix up some IME stuff with the setForwardedInsets work around" into rvc-dev am: 52a8fc73dc am: 20ae658a67

Change-Id: I8089c1a4f524c46c29b6adadb1e93e78b97071f9