Merge "Add XML for FEATURE_FREEFORM_WINDOW_MANAGEMENT"