Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev