Merge "Show QS data saver info dialog until enabled"