Merge "Listen to all attached QS pages." into pi-dev
am: fc16c4b3c4

Change-Id: Ia92a611955f44889602a8d6bb1e630abc4a06578