Merge "[Media Device] Add null check to avoid npe for compareTo method" into tm-dev