Merge remote-tracking branch 'PA/kitkat' into remix-legacy

Just want to update the merge head, without removing the QuietHours feature as PA removed it