Merge "Fix b/7087723 Patch leftover after tapping the red eye area" into jb-mr1-dev