Merge "Fix focusable on entire notification area if QS is expanded" into pi-dev