Merge "Do not update time offset for time lapse recording after pause" am: a864ea5f2d am: 05948baa04
am: 8d86a6d387

Change-Id: I705526227a7972f9d75d01a637756c123b32eeee