Merge "Ensure LayoutInflaterCompat forces set the correct Factory" into lmp-mr1-ub-dev