Merge "Fixed a bug where notification where invisible on the lockscreen" into mnc-dev