Merge "Camera: Avoid removing valid repeating requests" am: 0e7782c87b am: 468c1263cf

Change-Id: I5fec062950b09211988c3b784c1608dcfbaae191