Merge "Fixed that notifications didn't fade away when brightness changed" into nyc-dev