Merge "[Unfold transition] Use DISPLAY_CATEGORY_ALL_INCLUDING_DISABLED for the overlay" into tm-qpr-dev