Merge "Remove the <application> tag from SystemUIComposeFeatures" into tm-qpr-dev