Merge preference screen "Notification drawer style" into
preference screen "Notification drawer"