Conflict resolution after merging from CM for DisplayActivity.java