Merge "Merge "Workaround for back arrow being stuck on screen" into sc-dev am: db294649 am: 50293d4b" into sc-v2-dev-plus-aosp