Merge "Stop app switches only when home is the focused app" into main