Merge "Re-add deprecated app:theme functionality" into lmp-mr1-ub-dev