Merge "Add Feature Flag for guarding development of two-column notification shade"