Merge "Adding more context to swipe-to-home diags" into sc-v2-dev