Merge "Update Satellite Mode Key in Settings" into udc-dev