Merge "Allow notifications be to hidden from the lockscreen by app." into nyc-dev