Merge "SystemUI asset update." into klp-dev