Avoid shoot/zoom buttons display issue
Merge branch 'v2.7.x' of github.com:kazyx/WPPMM into v2.7.x