Merge "Bugreport in Quick Settings (if you turn it on)." into jb-mr1-dev