Merge "lockscreen_custom_transit_clock - Enable teamfood" into udc-qpr-dev