Back stack lag fixed
Up navigation lag bug fixed
Merge remote-tracking branch 'upstream/master'