Merge "Fix incorrect battery icon showing on the recent apps" into tm-dev