Merge "Fix possible menu-not-shown/search ui not shown problem"