Merge "Work around a framework bug setting LayoutInflater.Factory2" into lmp-mr1-ub-dev