Merge "Settings override for use_app_info_not_launched flag" into main