Merge "introduce LAYER_UI to replace LAYER_2D, deprecate latter" into devel/master