Merge "Status: Use vertical-align for progress bar instead of margin"