Merge "Fixed focusing order for the notification panel and QS" into lmp-dev