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