Merge "Show Settings bugreport handler only when developer option is enabled"