Restore previous camera overlay

Change-Id: Ia88870a673886cb580d820eacbffc762c9bd5cd0