Merge "HWUI: do nothing in case of empty layer" into nyc-dev