Merge "Prevent deadlock in AttentionManagerService" into qt-dev