Merge "Fix launchMode of TvUnblockSensorActivity."