Merge "Make secure views tolerate IME overlays." into gingerbread