Merge "fix transition from full overlays to fb"