Merge "Add media on lock screen setting" into tm-qpr-dev