Merge "Don't defer finish, only defer disableInputProxy" into ub-launcher3-rvc-dev am: 8a3be8cb53

Change-Id: I27a2dd42ecadc2e5048f048d9849cb4ae5f8c933