Merge "msm: camera: Fix flash issue timeout"
Merge "msm: timer: Don't check state of clock while setting next timer event"