Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev