Merge "Refrain from choking sysram due to excessive onShortcutChanged callbacks" into tm-dev