Merge "Add new flag for capturing power button feature." into main