Merge "Add CTS test for setDrawableByLayerId preserving level" into mnc-dev