Merge "Fix Data Saver page crashed when rotate" into udc-dev