Merge "Fix "No Notification" text not gradually showing on LockScreen" into tm-qpr-dev