Merge "Revert "Add aconfig flag for notification optimized linearlayout"" into main