Merge "Disable HW Layer handling in FragmentManager pre-KK" into mnc-ub-dev