Merge "EmulatedFakeCamera2: Minor fixes"