Merge "Updated btn_default and btn_toggle Bug: 5076695"