Merge "Don't call ActivityManagerService on main thread" into qt-dev