Merge "Refresh activity after stronger letterboxing for camera compat" into udc-dev