Merge "End live tile when quick settings expands, not just notification shade." into tm-qpr-dev