Merge browser action CSS changes from master

Fix browser action bug, more pin_locked->pinLocked

Conflicts:

	browser_action/browser_action.css