Merge "Adding actions to non client decor buttons"