Merge "fix failing tests of DisplayManagerService" into tm-dev