Merge "Consider multiple show-when-locked activities for wallpaper" into udc-dev