Merge "Power + Volume up key chord can now be configured." into sc-dev