Merge "Alignment of Settings contextual homepage"