Merge "4/N The road to Material NEXT (color int format)"