Merge "Update notification divider heights"