Merge "Change text and color of single app disable sub text" into main