Merge "Add Context.getDisplayId() to avoid possible IPC"