Merge "Merge "Add date(+weather)(+alarm+dnd) view to lockscreen if decoupling enabled." into tm-qpr-dev am: 2bde1bdcce am: 00960fae4c"