Merge "Fixed bubble badge position on stack move." into main