Merge "Adds quick affordances permission to theme picker." into tm-qpr-dev