Revert "Revert "Revert "camera: Hold 25 msec between preview cycles on restart"""

This reverts commit 40e7a2bd1041df3b52c9b37855171dc30965fe69.

Change-Id: I52f2e2dbd71118dec7bcdbea9893cb976ffed727