Merge "Force show_frame=1 when show_existing_frame=1"