Merge "Cache remove_app_switch_drops flag" into main