Merge "Set min height of 48dp to security footer" into sc-dev