Some 3P launcher transition fixes

Bug: 182494821
Test: Manual
Change-Id: Ia003b50493dce24a439fc735c990ee470975f68f
5 files changed