Merge "Add logout button style" into sc-qpr1-dev