Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev