Merge "Fix crash loop with back handler" into main