Change the logic at push state, make it right to match different header
view height.
Merge remote-tracking branch 'choose_remote_name/master'