Merge "Fix b/5974573 Please increase intensity of film grain effect" into jb-dev