Merge "Dynamically showing "driving mode"" into pi-dev