Merge "Extend "headless system" app-standby exemption" into tm-dev