Merge "Implement getting displayId from ActivityManager"