Merge "Workaround for back arrow being stuck on screen" into sc-dev