Merge "Allowing to expand the children from the lockscreen now" into nyc-dev