Merge "Don't force composited layers to be stacking contexts - DO NOT MERGE" into ics-mr0