Merge "Fix ugly black background when expanding/collapsing notifications." into master-lockscreen-dev