Merge "Not using custom layout in work mode dialog"