Merge "Separate notification area into own controller."