Merge "Fix formatting when dumping mDisplayHomeButtonHandlers" into main