Merge "Modify margin for overall contextual settings home screen"