Merge "Update wallet button size for large screens, reduce keyguard bottom text margin" into sc-dev