Merge "Fix reset app preferences for work profile apps" into tm-dev