Merge "Refactor UdfpsView into FrameLayout containing 2 views" into sc-dev