Merge "msm: camera: isp: fix for avtimer power collapse"